Missing Clone overrides

Change-Id: I0dda3dc849fce9ba994baa82f7e25497ea995c75