fixes but not done

Change-Id: Ic3009cfe8050defbebab2d9e6091bea13c00afb4