iwatch: fixes