Other small tweaks