Fixes for functions.