Small fixes to slave