Minor updates and changes based around the previous 1.4 changes