More DRLA fixes for Beta 6