some fixes for s2w