Final fixes to resolve #118