NYCCHKBK-4747 and NYCCHKBK-4252 bug fixes