Small updates and fixes.