Some Slim Specific changes