Fix a few issues with the last change