[AB] [00000] Add missing lib, fix misc. stuff