Fixed BackOffice issues