Fixed expanding of directory path
Fixed possibly wrong path to storage directory