Few more fixes for MIPS integration