misc Naxx fixes to make the fights work better