more cap fixes