Fix some space issues