- fixes to compatibility