Saw other commits. Making small adjustments.

So that we don't have conflicts