Fix key controls and a cloning bug