fixup issues 440 441 479