FW-184. Fixing switches to work for Windows and Linux.