more lib fixes