hammerhead: additional bring-up changes