More cap fixes