Fixes #8163, #8164, #8165.
Reviewed-by: Lauri Kasanen Reviewed-by: Tomas Härdin
Signed-off-by: Paul B Mahol <onemda@gmail.com>