Minor fixes (thanks @niwibe)