Fixing some minor setup details.