Hotfix couple of fresh modules [skip ci]