Some fixes and minor improvements to examining.