Block fixes and minor stuff