Small code adjustments.