Small fixes and fix when time mask = 0 for exp1