Various fixes to cover display