Bug fixes on number of params passed