Packstack fixes