Firefighters battle two fires in Johannesburg