Some fixes in build