Minor fixes all around