more fixes for 837 5010