Consolidated Windows Desktop implementation changes with OS X implementation