Changes to header and fixes for compile errors