Some small tweaks