Fixed a few pieces