Block fixes