LIBs fix

Change-Id: I33bb7084f7047f21dae1e4a8e6fefedd7ced73ab