Fixes and a rename