Minor handler improvements