some fixes to compatibility with 0.10