Fixing resources paths (master)