misc changes to get code completion to work properly in JSPs