Fixes for the change of the path