A few polishes to front-end