few build fix and derp fixes