Merge Dave's fixes for the compatibility tests and web.