Fix header
Fix db issues