Fixed direction enum and other adjustments