Fixing watch file and session on control file