Some fixes and renames