Small fixes to interface with backend.