Fixes for one click build.