Copying over changes from post-fork