More pkgs.lib -> lib fixes