Fixed caps issues in 2 spots