update a few things to match slim

Change-Id: Ida30f10770cd5fb3e040ef4dfb29f756eff7f245