Some minor fixes all over.