Sorted out the build a bit