Fix to be able to build external packages