patching holes in basement cement block wall
I removed a bunch of old paneling and furring strips in my basement, and in the process created several holes / nicks in the blocks. I can post pictures, but basically they vary from 1/2" to maybe 2" depending on how much got pulled out when I was removing the nails. None of these penetrate all the way through to the cavity in the block. Is hydraulic cement appropriate to use in this situation to patch these holes?
I also have a couple larger holes. One is about 3x4" and it was busted out to install an outlet. I planned on filling in the cavity with something (maybe that expanding foam stuff) to use as a backing and then using hydraulic cement as well. There are also a couple 1-2" round holes that penetrate through to the cavity of the block, and I was going to use the same method. Is this the way to go?
Finally, I have some cracks where the floor meets the wall, and was also going to use hydraulic cement there. Is there something better? I have read some discussions about different products, such as crack filler, and "Silicone Waterproof Concrete & Masonry Caulk", but am completely clueless. I appreciate any advice! Thank you!