fixes for 5010 837 I & P