Minor changes for further development

Nothing important to see here.

Change-Id: I63298efb9306391d74324e5b69085b41ee218eff