Fixes for printing