Minor header file fixes