Fixes Issues with OpenStruct, as well as some JS Fixes