A couple of improvements owed to user-feedback