Multiple:

  - array_get_safe() fix
  - tweaks