Fixed some issues pertaining to file locations.