Fixed various latest ansible changes