[#eng-3897] misc checking updates