Two MIPS fixes backport