Revisions to cmake-xxx modules for improved operation