Small fixes
Rework on Cover repository