1.5 Misc updates