Made enum consts const and fixed issue with inits.