finalize::drupal fixes, improvements