Small fixes to optional<T>