Some little tweaks