Fixes

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