Fixes for build.