Minor fix + third party libs