Some fix to the frontend