Still lib fixes