Addressed a few header issues