Fixx some cover boundaries to prevent timeouts