Small changes in print function generation