Safe return in absence of required fields
Removed unnecessary cast
Mixing plane update