Fixes to use new uwsim