JSP Support Fixes #2