Fix a few stupid mistakes I have made when 'fixing' kwsfetcher previously.