[various] Fix some hacc-related errors