Add workaround for type problem & improve coverage somewhat