couple bug fixes with unchoking