Fixes on signature