Fix front end for recent changes