Various updates

Here are some fixes that I did in the course of the WebKit update, but were not specifically needed for WebKit.