Fixing use of type_traits