Bug Fixes (from heroku logs)