Fix Watch3D problems