Slim stuff

Change-Id: Id18a82917e668bb23ede9236a8986ccaf0fb08f6