Fixes for bug#3657605