Fixes for datepicker and other minor tweaks