Fix some merge errors, etc.