Fixed dependencies and assemble paths