Various updates/adjustments