Fix builder for new environment