A few final adjustments