Lots of seemingly unrelated changes in this pull request. If possible, try to submit unrelated changes in seperate pull requests if you can.