fixes for struct enum matching