Fixed merge errors from last commit.