bug fixes from storm