Minor changes. BugFix through library update.