Fixes on func