Fix watched marks for files and frodo regression with progressbars