NYCCHKBK-4704 bug fixes