Corrected some fn calls