More spaced filename fixes