Final fixes for #1756