Moar master fixes

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