Slightly improve File & Buffer class