I have a 3ym20 yanmar diesel engine on my beneteau 323 (2005)sailboat. I am trying to do more work on it myself. I want to change the antifreeze(fresh water coolant). I know where to drain the system. My concern is developing an air lock. The water heater( in starboard locker) is heated in one of two ways(turn it on at the control panel or when motoring it is heated). I think the antifreeze(fresh water coolant) circulates in a loop to the water heater and heats it when motoring. I have heard that when changing the antifreeze an air lock can develop there. If an air lock develops then the engine can over heat when motoring. If this is the case how do I avoid developing an air lock or correct(bleed) the system? If you have this type of engine and experience please let me know. Thank you.