Sneaked in 2 earlier commits solving a published issue. Signed-off-by: Jan Mulder <jlmulder@xs4all.nl>