Some usability-fixes