A bit of building and fixes