Fix and update functions.