Updates to get role working correctly under Debian/Ubuntu.