Fixes for first commit.