Made sure we use the proper object types.