Final fixes for #82.