Fixed enough things to get assets to compile on master