Minor fixes (2)