Few improvements for usability