Catch up some changes I forgot to commit.