= Update build, fix a couple of bugs