File Changes

From #2162 and #2164.