Multiple bug fixes.
Testplatform OC6.0.3