Fixed issues with creating folders