Additional setup stuff.
Merge branch 'setup'