Fixes for S chip.