Minor fixes for backend