Fixes for build config