Fixed broken headers