Fixing the support libs issue