fix mrfive issues