Fixes to support compatibility