Scrapped AH tracking, Bug fixes