Resolve a few build issues

![](http://media.giphy.com/media/Mz26YNevTrRTy/giphy.gif)