watch fixes