Fixing minor bugs with services