Corrections to common function