Added fixes for UBRS/LBRS, and a few Naxxramas additions.