bug fixes

Change-Id: I8533a12d76001f37ae61816463696b814bbff35b