Bug fixings on getFile + getFolder