bugtracker fixes