Track wall fixes