Structural and other minor changes