Add conditions for services

also fixes incorrect defaults