Add some libraries and backport a fix from TB 1.1

Signed-off-by: Kristian Duske <kristian.duske@gmail.com>