Minor fixes pointed out by @mtbc