Some lame frontend changes