fix a few parts of basic building blocks