Fixes

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