Fix some enum stuff