Fixing a few issues in OF13Provider

Change-Id: Ib186a4e60aa1003e2e94d9b4298529250bb0f0e7
Signed-off-by: Madhu Venugopal <mavenugo@gmail.com>