Assorted fixes to ensure Struts upgrade and revised file handling works correctly.