A couple of changes to help sketch.c work