Some stuff for CMake
changed type of enums