Fix enable message
Fix conditions