Fixed undefined method calls