Fix enable/disable
Fix skips