Final fixes for #113