Bug fixes to metal supports