Fixes problems encountered with pkg-2.x: https://github.com/dlangille/SamDrucker/issues/1#issuecomment-2645233332