Updates for Spawn and Heroku plugins