QA bug fixes for zingermans