Minor initial setup adjustments
More minor adjustments