minor fixes all around