fixes to build setup