MORE melter fixes

Hopefully last for now