FIx some more spacing issues