cosmetic fixes for conditions