Frameworks: Squash more errors

Change-Id: Ibe63e879b7bf28d83abeec996a0d691fdd78ae3e
Signed-off-by: Evan Anderson <evan1124@gmail.com>