Removing the trailing directory separator.
Adding missed variabl/path changes