Fix for WIND sensor and fix for duplicate IDs. Closes #1656

This closes #1656.