Minor front end fixes