Last fixes from 6Wind patch.
10 files changed