Bug fixes and print reductions