Fixed some issues with costumes