Fix merge errors from last two commits