Misc fixes/changes

Not sure why it's including your commits also.