Fixes for H2M6 mentioned by Starscream