Merge pull request #1178 from jcowgill/mips-fixes