Minor fixes for -a option