More little fixes in the handling of the ACB