Merge "Fix some FSFileBackend IDEA errors"