Header file, enum fixes