Misc header additions