Misc fixes for struct types