fixes for watch