Fix blob content field regex; other cleanups