Some small changes. Don't merge.