Fixlets to previous commit.