Updated to latest version of libs to match current develop