Fixed two merge errors

These are breaking master.