Fixes several issues with Files, Import Files command