Fix more stuff

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