Fixed some parts