Various fixes to get it working with JSword's enhancements