Minor updates after feedback