Fix package tangles