Minor cleanup for ClearOS 7 support