Some viewer adapter fixes