Small less tweaks