Fix creating watches and straps