Fixes for enum