Some fixes and print removals