Correct visibility of pre/post process functions & minor changes