Forked some modules to mini versions for less verbose messages