Fix: some parts