MLDS-727 Fix some of the remaining cursor and underscore issues