Finally got the file system stuff back in shape.