Various fixes and adjustments to Zeus driver