Updates for Heroku
Fix day order