Fix checks Refs #6490, api update fixes #6238