Some undoing of coverage code.
Added fix for load.