zeus: fix as3676 & various forgotten things

Signed-off-by: Michael Bestas <mikeioannina@gmail.com>

Change-Id: I5716d065d3820d26af426d9fe9e060f3052a1a57
Signed-off-by: garwedgess <garethwilliams21@gmail.com>