Fix missing auto-mappings