Assorted changes while moving files over