DIY watch fixes