todo tweaks - mostly related to make check analysis