Fix a few bugs in the core