Fix completion functions.