Fixes for previous commit.