Further fixes file/folder

Signed-off-by: Nigel Magnay <nigel.magnay@gmail.com>