Some extra work on library sync #19