Cleaned up some extension header stuff