Cover art fixes

I've looked again over the whole PR. This fixes some of the last things that I have noticed. Looks like we can merge it in the next week. :smile: