fix wildfly 35 hibernate issues

we encountered these two issues when upgrading to Wildfly 35.

As discussed last week, I'm not sure if my solution to the LazyInitializationException is ideal