Post directory update, misc changes