346 Fix headers