Fix Compilation and make portlint a little bit happier. Not included in the diff: Maybe it would be good to move it to a different location maybe science, because it is more meant for research I think.
State Changed From-To: open->closed Committed, thanks!