Fix handling of watch functions