Small service changes for better actual usability