Some structure adjustments