prep source/sink fixes