more slim changes

Change-Id: I348e981d463d7bdf2e9915591d5b79d15103c702