Minor updates to surrounding files