Cleaned up some header issues