Fix some parts.