Clean up makedirs wrt recent updates and fixes