More fixes

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