Fix small bugs introduced by the last commit.