Fix some cases for finding the DeviceSupport directory