Minor changes which bugged exchange2007.

Signed-off-by: Michel <info@1st-setup.nl>