Additional (partial) fixes for issue #3405