Further BEAST remediation

Change-Id: I957c52aebe5f4351c915845b48fc961afe9b1703