Merged mooc branch, had too add some more absolute paths.