Fixes in push driver.
Reverted move of get_option to helpers.