Minor fixes II