Import from puddle, fix build