Bunch more little Slave-related things
Merge branch 'slave-view-update'