Various Services fixes and trials