Cap task fixes