Fixed packaging problems