Some minor usability refactorings