Fixes to use the mobile engine properly