A few quick tweaks