Fix nulleable keys mappings