Constants 2-Build Fix