Small tweaks on Development and Services