Fixes header and too many consts issues