Multiple fixes

Fixed CPPI support
Removed destruction when in water