Missing headers and typo

Had to make these small edits to be able to compile the develop branch.