Some changes for AA in heroku