Minor updates for usability reasons