Fix a few issues related to new features