Fix issues with duplicate lib in portal