Moar Fixes

Change-Id: I58166a13af49e1ba42a1201792f9872d7d8c9ea4
Signed-off-by: DHO <DHO@dho.im>