Fixes to previous commit.