various build fixees