fixes to -a -o