Few fixes done for testing on heroku