Minor changes to support webkit testing.