Minor code adjustments