Fix some errors in acbf generation.
Only noticed some of these while going over the specs once more...