app vs. watch fixes