Drupal misc #784

Some commits from #784.

Are there more items from that ticket that need to be done?