Minor space removal fixes