Small fixes in blocks