Fixes from merger

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