fixes for endeavoru

Change-Id: I8749f4a13d44f60001e33feabcad78da4ff859e3