Fix parts of cover setup and interaction