Minor fixes and renames