SIO tweaks

Change-Id: I9bd720ed997c8523c4f7100795d775fd6b4b0c6d