Final fixes for #1135