Back end fixes