more hybrid fixes