Extra print function fixes