SIO tweaks

Change-Id: I80344261c56b285581a3c0ced27aeea60f182104