Also make sure it's distilled water for both ice and boiling water, or you're off due to the dissolved mineral salts (lower melting point and higher boiling point). You don't need much minerals to get 0.1 degree change there.
The melting ice is the easiest, and a single calibration point should give you a pretty good correction already.