Some more notices fixed (#672)