Additional 1.5 tweaks