Fixed some none warnings and thin ice pirouette