Fix fuckups
Pull latest library changes