Minor bug fixes.
Adds manufacturer and product IDs for Mac.