Minor OCD tweaks