Small fixes on the slave