genericStack fixes