Fixup for some slaves

Change-Id: I8a5e0e17a44a9b8d180378433e5f3777b4ba262f