Fixed some calls

Besides implementing the functions, it should be done