Fixing up small space issues