Minor pkg clean up