Final fixes for #950