Made the pipeline additions a little more generic, so they wouldn't break on the Mac.