Add functions to header, fix compilation warnings