Minor fixes, plus zero-suppressed input files