Fix some issues caused by the previous commit.