Fix the object event issues and be consistent with the returns