Corrections for #30