A couple small tweaks