Integrated fixes from sb and dc