Fixing =[] bug in some functions

Change-Id: I4bba3fc6ace0bafdb7967342972cfd20b9ec1faa