More tweaks #2