[mr2814] fix win compile problems in last commits (thx to all).
SD2 update