Fixed problems seen in WindRiver