Minor changes to different files