Fixes to the header files...