Misc fixes and renames