Fixing up mappings and admin