Fixes, cleanup more headers