Some updates and fixes.