Fix hardcoded argument count.. not all callbacks have 3 arguments :)
Fix argument order