Fix user_main on this branch as well