Bug fixes.
Tested CMSMS 2.0 Compatible.