Tweaks to entry point file

Change-Id: I280f19a0e0f0f7913afcc14b2edda5ba644f9fe5
Merge "Tweaks to entry point file"