Fixed work grid issues.