Fixed enumeration warnings