#16: Fixed references to new libraries.