Corrections based on list from @jesperbylund