Minor fixes for the back office