Fix space issues