Final small tweaks