package mode fixes