fixes on previous s2w commits