Fix problems introduced by previous commit.