Minor changes across the board