More fixes for the changed function name