Compile Fixes

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