Fixes and additions to Zeus driver