Fixes for watchbot