Minor improvements+lunch enabled

Change-Id: I1ad3ed1a99598a6a24a8ddfe1c29e9c9ae940504