Fixed clean install build failure, and locked versions