Added tweaks for ClearOS 7 support