More updates to relative paths