Fixes to new cover handling code