issue tracker fixes