Split building and launching in contents and other minor fixes