cosmetic fixes (closes: #1276)