Final fixes for #45