Fix a few issues left over from recent changes