Fixes produced by SharkTree API changes