web-5.6 minor fixes