Fix package headers