Fix discrepencies between mctop and mcrank