cluster/afr: bug fixes

Change-Id: I26d6d4cb28f67d2c85a28094cfd6e3e88b6e1dc5