Cosmetic changes for ClearOS 7 compatibility [tracker #1791]