Fix dependencies issue on product build