Misc fixes and more plate changes