Small changes to GC algo

Change-Id: Id1fd8af12f55275daa229ff4a8d7dd51116128de