More fixes that are not really fixes. Trying to get compile to 100% so I can start testing in game.