More fixes according to WFLY team feedback.