Misc Aesthetic fixes.
Fix borked fix.