weblogic-fixes

This pack of two commits are needed for Weblogic. Would you be so kind to review them?

Thank you!