Pack Detector bug-fixes

Small Pack Detector bug-fixes