Fixed input options for Watch Time & other minor fixes