Updates to fix some issues.