Some minor changes in multiple files