Improve some other s2s errors