Fix 'illegal invocation' problems.