Fix enum types. Closes: #1