more block fixes