Fix non-field errors in demo.