Fix a few ST related bugs with IC's.