additional fixs

Change-Id: Icba3701acefa8d6a5f46ce1affac47a77a3c469e