Corrections to allow Heorku work properly