Fix a few issues with griddle.