short rmi fixes