Fixed issues with auto build.