Bump param count and fix who more