fixes for production path scaling, global fixes still slated