build fixes

Here are some build fixes. Have fun :)