Slim stuff

Change-Id: I73d7b52f6af80c337903a87803f8ac41a18ce29d