More build types and minor cleanup