Fixes for blob build