Fixes for bulk02. #1439