Small front end fixes