Fix some dependency issues
Set up real server names/configs we will use