Enable experimental, fix code