Various fixes

Change-Id: I70509d19d1df01e998de4804bc7c1e1899ad8dee
4 files changed