small rmi bugs fixed