Fixes

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