More ST2 upgrade fixes