Ensuring params are correctly passed into watch-functions