More fixes for the abuse lookup!