Amend fixes for -b option