Better fixes for the last commit.