Code watching: Some bug fixes