Some front end fixes