development fixes to unsure retrocompatibility