Fixes for toggle and checkbox