Added Andy Bovett's Thunderbird and Windows fixes