Some minor tweaks

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