Some user response improvements