Fix a few issues probably brought by rebase