Fixed blocks issues