Fixed some SetPoint problems