Fixing enum problems