manual minor fixes