Space bar fixes