Fixing spacing problems from rkatic's patches.