Fixed dependencies and sources