makes small fixes to make compatible with master branch