Fix some enum issues