Adjustments for better routing properties