Fixes for generate weave keyType