Fixes for 9110 functionality.