Fixed cap mistakes