A few more fixes before build