small cover code improvements