Fixed dependencies and library mappings