Fix conflicts with Cycle & Cycle 2 plugins