Fixes to support JavaDoc and testing screencast.