Tiny minor tweaks