Small changes from user feedback