Make panda mappings a bit safer