Some fixes for Heroku 3
Some fixes for Heroku(according to K_schema)