add fixes
Merge pull request #26 from smurashov/platform/stable/havana

add fixes