Lots of fixes with blob gen