Minor code adjustments.