Few cap fixes