Fixes for functions support.