Fix some front-end