Fix some parts