Re-enable waterpolys etc