Some more cleanup, build fix