Channel and Server are conform to new specifications.
Minor fixes.