Various fixups, will be folded in correct commits eventually. Signed-off-by: Anas Nashif <anas.nashif@intel.com>