Some tweeks to get the S3 methods working.