Minor grab fixes for demonstration build.