Pushing changes, mostly minor work