Some minor tweaks

I made a few tweaks to the ansible scripts based on issues I encountered. The commit messages have more details.