Review and applying fixes according to WFLY team feedback.