Change a few things to match CM/Omni and Slim

Credit/Thanks to all original authors/creators

Change-Id: I301dd8c743c66f20e42309ffd61a1a33558b779e