fixes for rm2.x