Fixed some relative path issues