pin related fixes

Change-Id: Idcbdbadf2aed761a0a9240ef4bc5247ffac0ce4f