fix lifecycles and interfaces for 3.1m5 compatability