Frameworks: Fix Various errors

Change-Id: Id4c1a123a557ed72b827f8932bc4d0aca2ea5e19