Fixes to last commit.