Various cover fixes