Fixed minor bugs relating to header files.