Made some fixes for 2.5 only functions and event triggers