A few frontend changes