Addressed last nits