Adjusted a few variables for easier path handling