Different fixes in blocks