Changes according to WebKit bug comments