[misc] Use correct scope and mark as optional a few dependencies