Harder conditional fs support