Consistent publicity
Fixing function calls after previously changed signature