Misc. changes from last commit.