s2w & dt2w fixes