Added fixes for Watch erroring out