Fix retention and lint
3 files changed