Fix services problem as its name suggests

Some problems were spotted on develop while merging. This branch shall contain some fixes for that.