A few bugs with the merge from master