Header fixes/ cleanup