Adding fixes and making it work

Change-Id: Id3ee1cc282e7a656645db078ab5732662651d4df