Fix stupid bugs introduced by last commit.