Added a few more things for 3.6

Change-Id: I08354cbd6e9c4462d12b5b0c0d887c1ba1d9d5fe