Some final adjustments