just some fixes

Change-Id: I8837a104030d1c8efd752574101537bc717876b4