More Herokuifications