Minor updates for better usability