Corrected some caps issues