Some refinements to the front-end