fixes for build