Various fixes for newer Ansible methods.