Fix-Ups for preparing WITH