Added some tweaks for ClearOS 7 support