Some struct visibility fixes