Fix a few front end issues