Small fixes all around