Correcting more unneeded caps