Some weird changes before merging up.