Drupal: boolean fix
Drupal: boolean fix
Drupal: fix typo
Drupal project: various fixs