Retrocompatibility fixes