Fix path changes in std
Merge pull request #167 from jnicklas/path_fixes

Fix path changes in std