Actually fix discrepencies between mcrank + mctop